Fix indentation use a macro to make code a bit more readable.

Tue Oct  2 11:29:50 2001  Owen Taylor  <otaylor@redhat.com>

        * gdk-pixdata.c (gdk_pixdata_to_csource): Fix indentation
        use a macro to make code a bit more readable.

diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog
index 9a1b8c09903caf98be74c1a611dfbb6d049b7e11..bb93b87d8c3a3b2ea728b0635ea9973efd238fea 100644 (file)
--- a/gdk-pixbuf/ChangeLog
+++ b/gdk-pixbuf/ChangeLog
@@ -1,3 +1,8 @@
+Tue Oct  2 11:29:50 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk-pixdata.c (gdk_pixdata_to_csource): Fix indentation
+       use a macro to make code a bit more readable.
+
 2001-10-02  Sven Neumann  <sven@gimp.org>
 
        * gdk-pixdata.c: g_string_printfa => g_string_append_printf. 

diff --git a/gdk-pixbuf/gdk-pixdata.c b/gdk-pixbuf/gdk-pixdata.c
index bf1a96e2c0750f03562e6284fc3232c78fdd41e8..8437b46065fa84e115c5270ceb33081a84ad63cf 100644 (file)
--- a/gdk-pixbuf/gdk-pixdata.c
+++ b/gdk-pixbuf/gdk-pixdata.c
@@ -22,6 +22,7 @@
 #include "gdk-pixbuf-i18n.h"
 #include <string.h>
 
+#define APPEND g_string_append_printf
 
 /* --- functions --- */
 static guint
@@ -482,7 +483,7 @@ save_uchar (CSourceData *cdata,
     }
   if (d < 33 || d > 126)
     {
-      g_string_append_printf (gstring, "\\%o", d);
+      APPEND (gstring, "\\%o", d);
       cdata->pos += 1 + 1 + (d > 7) + (d > 63);
       cdata->pad = d < 64;
       return;
@@ -519,28 +520,28 @@ save_rle_decoder (GString     *gstring,
                  const gchar *s_uint_8,
                  guint        n_ch)
 {
-  g_string_append_printf (gstring, "#define %s_RUN_LENGTH_DECODE(image_buf, rle_data, size, bpp) do \\\n",
-                   macro_name);
-  g_string_append_printf (gstring, "{ %s __bpp; %s *__ip; const %s *__il, *__rd; \\\n", s_uint, s_uint_8, s_uint_8);
-  g_string_append_printf (gstring, "  __bpp = (bpp); __ip = (image_buf); __il = __ip + (size) * __bpp; \\\n");
+  APPEND (gstring, "#define %s_RUN_LENGTH_DECODE(image_buf, rle_data, size, bpp) do \\\n",
+         macro_name);
+  APPEND (gstring, "{ %s __bpp; %s *__ip; const %s *__il, *__rd; \\\n", s_uint, s_uint_8, s_uint_8);
+  APPEND (gstring, "  __bpp = (bpp); __ip = (image_buf); __il = __ip + (size) * __bpp; \\\n");
   
-  g_string_append_printf (gstring, "  __rd = (rle_data); if (__bpp > 3) { /* RGBA */ \\\n");
+  APPEND (gstring, "  __rd = (rle_data); if (__bpp > 3) { /* RGBA */ \\\n");
   
-  g_string_append_printf (gstring, "    while (__ip < __il) { %s __l = *(__rd++); \\\n", s_uint);
-  g_string_append_printf (gstring, "      if (__l & 128) { __l = __l - 128; \\\n");
-  g_string_append_printf (gstring, "        do { memcpy (__ip, __rd, 4); __ip += 4; } while (--__l); __rd += 4; \\\n");
-  g_string_append_printf (gstring, "      } else { __l *= 4; memcpy (__ip, __rd, __l); \\\n");
-  g_string_append_printf (gstring, "               __ip += __l; __rd += __l; } } \\\n");
+  APPEND (gstring, "    while (__ip < __il) { %s __l = *(__rd++); \\\n", s_uint);
+  APPEND (gstring, "      if (__l & 128) { __l = __l - 128; \\\n");
+  APPEND (gstring, "        do { memcpy (__ip, __rd, 4); __ip += 4; } while (--__l); __rd += 4; \\\n");
+  APPEND (gstring, "      } else { __l *= 4; memcpy (__ip, __rd, __l); \\\n");
+  APPEND (gstring, "               __ip += __l; __rd += __l; } } \\\n");
   
-  g_string_append_printf (gstring, "  } else { /* RGB */ \\\n");
+  APPEND (gstring, "  } else { /* RGB */ \\\n");
   
-  g_string_append_printf (gstring, "    while (__ip < __il) { %s __l = *(__rd++); \\\n", s_uint);
-  g_string_append_printf (gstring, "      if (__l & 128) { __l = __l - 128; \\\n");
-  g_string_append_printf (gstring, "        do { memcpy (__ip, __rd, 3); __ip += 3; } while (--__l); __rd += 3; \\\n");
-  g_string_append_printf (gstring, "      } else { __l *= 3; memcpy (__ip, __rd, __l); \\\n");
-  g_string_append_printf (gstring, "               __ip += __l; __rd += __l; } } \\\n");
+  APPEND (gstring, "    while (__ip < __il) { %s __l = *(__rd++); \\\n", s_uint);
+  APPEND (gstring, "      if (__l & 128) { __l = __l - 128; \\\n");
+  APPEND (gstring, "        do { memcpy (__ip, __rd, 3); __ip += 3; } while (--__l); __rd += 3; \\\n");
+  APPEND (gstring, "      } else { __l *= 3; memcpy (__ip, __rd, __l); \\\n");
+  APPEND (gstring, "               __ip += __l; __rd += __l; } } \\\n");
   
-  g_string_append_printf (gstring, "  } } while (0)\n");
+  APPEND (gstring, "  } } while (0)\n");
 }
 
 GString*
@@ -634,11 +635,11 @@ gdk_pixdata_to_csource (GdkPixdata        *pixdata,
 
   /* initial comment
    */
-  g_string_append_printf (gstring,
-                   "/* GdkPixbuf %s C-Source image dump %s*/\n\n",
-                   bpp > 3 ? "RGBA" : "RGB",
-                   rle_encoded ? "1-byte-run-length-encoded " : "");
-
+  APPEND (gstring,
+         "/* GdkPixbuf %s C-Source image dump %s*/\n\n",
+         bpp > 3 ? "RGBA" : "RGB",
+         rle_encoded ? "1-byte-run-length-encoded " : "");
+  
   /* dump RLE decoder for structures
    */
   if (cdata.dump_rle_decoder && cdata.dump_struct)
@@ -652,33 +653,33 @@ gdk_pixdata_to_csource (GdkPixdata        *pixdata,
    */
   if (cdata.dump_macros)
     {
-      g_string_append_printf (gstring, "#define %s_ROWSTRIDE (%u)\n",
-                       macro_name, rowstride);
-      g_string_append_printf (gstring, "#define %s_WIDTH (%u)\n",
-                       macro_name, width);
-      g_string_append_printf (gstring, "#define %s_HEIGHT (%u)\n",
-                       macro_name, height);
-      g_string_append_printf (gstring, "#define %s_BYTES_PER_PIXEL (%u) /* 3:RGB, 4:RGBA */\n",
-                       macro_name, bpp);
+      APPEND (gstring, "#define %s_ROWSTRIDE (%u)\n",
+             macro_name, rowstride);
+      APPEND (gstring, "#define %s_WIDTH (%u)\n",
+             macro_name, width);
+      APPEND (gstring, "#define %s_HEIGHT (%u)\n",
+             macro_name, height);
+      APPEND (gstring, "#define %s_BYTES_PER_PIXEL (%u) /* 3:RGB, 4:RGBA */\n",
+             macro_name, bpp);
     }
   if (cdata.dump_struct)
     {
-      g_string_append_printf (gstring, "%s%sGdkPixdata %s = {\n",
-                       cdata.static_prefix, cdata.const_prefix, name);
-      g_string_append_printf (gstring, "  0x%x, /* Pixbuf magic: 'GdkP' */\n",
-                       GDK_PIXBUF_MAGIC_NUMBER);
-      g_string_append_printf (gstring, "  %u + %u, /* header length + pixel_data length */\n",
-                       GDK_PIXDATA_HEADER_LENGTH,
-                       rle_encoded ? img_buffer_end - img_buffer : rowstride * height);
-      g_string_append_printf (gstring, "  0x%x, /* pixdata_type */\n",
-                       pixdata->pixdata_type);
-      g_string_append_printf (gstring, "  %u, /* rowstride */\n",
-                       rowstride);
-      g_string_append_printf (gstring, "  %u, /* width */\n",
-                       width);
-      g_string_append_printf (gstring, "  %u, /* height */\n",
-                       height);
-      g_string_append_printf (gstring, "  /* pixel_data: */\n");
+      APPEND (gstring, "%s%sGdkPixdata %s = {\n",
+             cdata.static_prefix, cdata.const_prefix, name);
+      APPEND (gstring, "  0x%x, /* Pixbuf magic: 'GdkP' */\n",
+             GDK_PIXBUF_MAGIC_NUMBER);
+      APPEND (gstring, "  %u + %u, /* header length + pixel_data length */\n",
+             GDK_PIXDATA_HEADER_LENGTH,
+             rle_encoded ? img_buffer_end - img_buffer : rowstride * height);
+      APPEND (gstring, "  0x%x, /* pixdata_type */\n",
+             pixdata->pixdata_type);
+      APPEND (gstring, "  %u, /* rowstride */\n",
+             rowstride);
+      APPEND (gstring, "  %u, /* width */\n",
+             width);
+      APPEND (gstring, "  %u, /* height */\n",
+             height);
+      APPEND (gstring, "  /* pixel_data: */\n");
     }
   if (cdata.dump_stream)
     {
@@ -687,40 +688,40 @@ gdk_pixdata_to_csource (GdkPixdata        *pixdata,
       stream = gdk_pixdata_serialize (pixdata, &stream_length);
       img_buffer_end = stream + stream_length;
 
-      g_string_append_printf (gstring, "%s%s%s %s[] = \n",
-                       cdata.static_prefix, cdata.const_prefix,
-                       cdata.dump_gtypes ? "guint8" : "unsigned char",
-                       name);
-      g_string_append_printf (gstring, "( \"\"\n  /* Pixbuf magic (0x%x) */\n  \"",
-                       GDK_PIXBUF_MAGIC_NUMBER);
+      APPEND (gstring, "%s%s%s %s[] = \n",
+             cdata.static_prefix, cdata.const_prefix,
+             cdata.dump_gtypes ? "guint8" : "unsigned char",
+             name);
+      APPEND (gstring, "( \"\"\n  /* Pixbuf magic (0x%x) */\n  \"",
+             GDK_PIXBUF_MAGIC_NUMBER);
       cdata.pos = 3;
       save_uchar (&cdata, *stream++); save_uchar (&cdata, *stream++);
       save_uchar (&cdata, *stream++); save_uchar (&cdata, *stream++);
-      g_string_append_printf (gstring, "\"\n  /* length: header (%u) + pixel_data (%u) */\n  \"",
-                       GDK_PIXDATA_HEADER_LENGTH,
-                       rle_encoded ? pix_length : rowstride * height);
+      APPEND (gstring, "\"\n  /* length: header (%u) + pixel_data (%u) */\n  \"",
+             GDK_PIXDATA_HEADER_LENGTH,
+             rle_encoded ? pix_length : rowstride * height);
       cdata.pos = 3;
       save_uchar (&cdata, *stream++); save_uchar (&cdata, *stream++);
       save_uchar (&cdata, *stream++); save_uchar (&cdata, *stream++);
-      g_string_append_printf (gstring, "\"\n  /* pixdata_type (0x%x) */\n  \"",
-                       pixdata->pixdata_type);
+      APPEND (gstring, "\"\n  /* pixdata_type (0x%x) */\n  \"",
+             pixdata->pixdata_type);
       cdata.pos = 3;
       save_uchar (&cdata, *stream++); save_uchar (&cdata, *stream++);
       save_uchar (&cdata, *stream++); save_uchar (&cdata, *stream++);
-      g_string_append_printf (gstring, "\"\n  /* rowstride (%u) */\n  \"",
-                       rowstride);
+      APPEND (gstring, "\"\n  /* rowstride (%u) */\n  \"",
+             rowstride);
       cdata.pos = 3;
       save_uchar (&cdata, *stream++); save_uchar (&cdata, *stream++);
       save_uchar (&cdata, *stream++); save_uchar (&cdata, *stream++);
-      g_string_append_printf (gstring, "\"\n  /* width (%u) */\n  \"", width);
+      APPEND (gstring, "\"\n  /* width (%u) */\n  \"", width);
       cdata.pos = 3;
       save_uchar (&cdata, *stream++); save_uchar (&cdata, *stream++);
       save_uchar (&cdata, *stream++); save_uchar (&cdata, *stream++);
-      g_string_append_printf (gstring, "\"\n  /* height (%u) */\n  \"", height);
+      APPEND (gstring, "\"\n  /* height (%u) */\n  \"", height);
       cdata.pos = 3;
       save_uchar (&cdata, *stream++); save_uchar (&cdata, *stream++);
       save_uchar (&cdata, *stream++); save_uchar (&cdata, *stream++);
-      g_string_append_printf (gstring, "\"\n  /* pixel_data: */\n");
+      APPEND (gstring, "\"\n  /* pixel_data: */\n");
       img_buffer = stream;
     }
 
@@ -728,21 +729,21 @@ gdk_pixdata_to_csource (GdkPixdata        *pixdata,
    */
   if (cdata.dump_macros)
     {
-      g_string_append_printf (gstring, "#define %s_%sPIXEL_DATA ((%s*) \\\n",
-                       macro_name,
-                       rle_encoded ? "RLE_" : "",
-                       s_uint_8);
-      g_string_append_printf (gstring, "  \"");
+      APPEND (gstring, "#define %s_%sPIXEL_DATA ((%s*) \\\n",
+             macro_name,
+             rle_encoded ? "RLE_" : "",
+             s_uint_8);
+      APPEND (gstring, "  \"");
       cdata.pos = 2;
     }
   if (cdata.dump_struct)
     {
-      g_string_append_printf (gstring, "  \"");
+      APPEND (gstring, "  \"");
       cdata.pos = 3;
     }
   if (cdata.dump_stream)
     {
-      g_string_append_printf (gstring, "  \"");
+      APPEND (gstring, "  \"");
       cdata.pos = 3;
     }
     
@@ -755,11 +756,11 @@ gdk_pixdata_to_csource (GdkPixdata        *pixdata,
   /* pixel_data trailer
    */
   if (cdata.dump_macros)
-    g_string_append_printf (gstring, "\")\n\n");
+    APPEND (gstring, "\")\n\n");
   if (cdata.dump_struct)
-    g_string_append_printf (gstring, "\",\n};\n\n");
+    APPEND (gstring, "\",\n};\n\n");
   if (cdata.dump_stream)
-    g_string_append_printf (gstring, "\");\n\n");
+    APPEND (gstring, "\");\n\n");
 
   /* dump RLE decoder for macros
    */